NotOkayException and map refactorings/comments