Very simple configuration
Refactoring
Cleanup