Some more refactoring :sparkles: