Various
Removed redundant logic
Remove clojure as dependency
Formatting