clean up methods
Merge branch 'master' of https://github.com/salilgupta1/nomisma