Refactor / explicit return