Resolves #85 Refactoring