Refactor state shortcuts