Removed dead code and unused arguments (+ fixed a few typos)

"default" is necessary in order to always return a result