Topic/misc cleanup

Some minor cleanup items.

It looks like Scrawl was the original author of getEffectMultiplier(), if there are any concerns about the return change.