Removed some comments/test code, fixed styles of includes.