Refactor course find