Function name polish.
Killed some useless, confusing code.