Clean up and reformat after code style