[TASK] Fix whitespace issues