refactor to nicer naming