better semantic/naming