Refactorting / cleanups