cleanup @itkovian's remarks