Cosmetic changes
Added GET/SET_STATE codes