clean up, remove more ambiguity