Cleaned up some of the comments and stale variables