Reorder methods and fields