removed unnecessary code + formatting