Formatting and General Cleanup