code cleanup
cleanup
jslint is f* picky