Removed some comments, tweaked some minor things