Improved readability of the State pattern