Remove extra code, adjust code formatting