Fixed return, used better variable names