spacing conversion completed
refactor / clean up