Fix code style
Move function to a related section in the code