removed some unnecessary code, no major improvements yet