Fix switch statement
Bring inline with book and fix bug