Refactoring and overview picture