Author: Cole
Commit: Small code refactoring
Author: Cole
Commit: Additional code refactoring
Author: Cole
Commit: Code refactoring
Author: Cole
Commit: Small code refactors, more consistent naming, remove log all statements