Refactoring oset! a little bit