code clean up and jsorolla updated