Cleaning stuff up, adding comments.