Started refactor

Started refactoring to a style standard
refactor
removed some s