Formated code, deleted unused and commented methods