State Pattern Classes improved to be checkstyle conformable