Removed unneeded include and cleaned up a bit