Refactor - Remove blank space