Formatting and clean up changes