Remove extra lines, fixed mismatching method names