Refactor. Simplify. Etc. Not sure any more.