Whitespace cleanup on helpers