Code cleanup, fixed comments.