cleaning up commments and codes, adding method mutator