[DEV] Whitespace cleanup