Code Clean Up + Formatting