Styr refactor

Refactor part 1 - Working code