refactored class names (removed decide part)