Refactor.
Another refactor.
Tighten-up the code.