Refactoring some code with some profiling and just moving some items around.