- In progress: Unit tests added
- In progress: Refactoring using ReSharper 8.1 for consistency