Small fix+consistent refactor