removed inline styles
added some comments
Refactoring