removed some commented code and minified