More optimizing and duplicate method crunching...