deleted uneeded code, formating