Remove unused includes and clean up minor coding style issues.