Removed utilitiy classes
Improved comments.
Improved logging and exception handling
Merge branch 'feature/refactor' into develop