Adjust code formatting for more consistency