removed some things and fixed formatting