Remove a really superfluous function
Improve clumsy code

God, I really love dash.el