deleting comments and cleaning code