Small code clean up and updated rjasmine