comments and code cleanup mostly