Manage to to clean up some coding a bit.