Removed unneeded includes and added a few comments