Add styling, Code Cleanup