Changes

Extract returns from conditionals for packages starting by o
This makes the code more readable since we can directly know that the
conditional will necessarily return something and the execution can be
stoped.

Extract returns from conditionals for packages starting by o
This makes the code more readable since we can directly know that the
conditional will necessarily return something and the execution can be
stoped.