Code cleanup, and added a comment