cleanup comments and code