Code cleanup, commentfest