Formatting and some cleanup