A massive cleanup.

Use IsState class and add a error handling rescue using en.yml file