PR for dev_1.0

>_< Followed the wrong standard for switch case statements.