Code formatting
Refactoring
Refactoring
exception message updated
Fixes #62 and #63 (Merge request overriden)