Made a few more methods private