Did some tiny refactoring