refactoring, removing calls I don't quite understand