Formatting and rearranging some methods