Clean up. Refactoring