cleaning up, improvements, etc
Merge pull request #101 from Mirantis/fix/refactoring

cleaning up, improvements, etc