Fixed bugs from incorrect renaming
Made some methods private