Refactor add_space() #18