refactoring: remove some _:spaces