Refactoring: Remove needless do
Stop using defn inside other defn