Cleaning up state definitions a little
Added cleaner directional input mapping