Minor changes after code review

@metamatik, as discussed those are the changes to requirements I'd like to propose.