Sample review updates (control.c)

- return enum
- remove multiple returns