refac
updated styling and refactoring
Merge pull request #1 from JeuelyFish/refact

Refact