more formatting changes
removed unnecessary code