whitespace cleanup and include guard fix