More cleanups
Refactor