more refactoring
add space