removed junk and fixed more formatting