Tiny refactoring accourding suggestions