Polishing/refactoring project