Stylin and some refactors

check it buddy

[ ] - @stevehayes