Another speed boost, as well as more descriptive code.