* Styling changes
* Code restructure