Code cleaning and formatting for prettiness.