v1.0.0 - Added test coverage
minor refactor