Totally refactored codebase to suit conventions
Totally refactored codebase to suit conventions
Totally refactored codebase to suit conventions