minor semantical cleanup