cleaned up Input