Simplify input section a bit