*8129* Whitespace cleanup