Clean up look of code