Reorder methods and clean up.