Simplify solution entry code