Code readability treatment
Increased test coverage to 100%