Refactor, cleanups...