More refactoring
More refactoring: themes part 1