Develop

Refactor & Style changes