removed else case from each state in case block