- refactor to fix white space issue