Optimize input executions + Cosmetics