Code cleanups... Make it smaller