Chore refactored

Should be to code reviewing standards now