Cleaned up lots of unnecessary comments!