Minor refactoring
Tmp
Cleanups