Some tiny refactoring
Some more refactoring