Misc

Refactoring