Code cleanup and added styles

Code cleanup and added styles