Formatting and more cleanup