Added analyze task for lein, more refactoring