Resolves Issue #27 - Refactoring

Resolves Issue #27 - Refactoring