updates comments and clearn up