Simplify solution entry further