Cleanups white-space

Prefer tabs over spaces
Updates ChangeLogs with recent changes
Comment matches what the class is doing
Adds missing header file includes
Removes unnecessary header file includes