Formating code, some methods changes, adding footer