Additional Eclipse whitespace cleanup