Started refactor

Started refactoring to a style standard