removed not used stuff
made some methods private