More refactoring & tidying of overview