More cleanup - get input values function