Housekeeping

+Rename, cleanup, comment.