Refactor - remove right side whitespaces