[Refactor] Whitespace