Increased Coverage to 98% of lines, made some formatting changes to better follow PSR requirements and general refactoring