Two flag variables indicating current program state were replaced with
one variable holding a state defined in enum