Cleanup & Small refactoring.