Code refactoring
dev requirements
extended refactoring