refactored towards if-error conditions and less .Model(...) usage

refactored towards if-error conditions and less .Model(...) usage #517