Refactoring, added few exceptions, nothing functional