Reorders code for better readability