#Tiny refactoring