Made some methods private