Clean up, refactoring...