Removed commented-out code, and added a few comments.