Code cleanup/comments