Formatting and Code Clean up