This seems more clear (refactor)