Some clean up commenting