Use attr_reader's instead of instance variable acccess
Use a real case/when statement