Minor comments and cleanup