updated the returns the other guy had them backwards, cleaned up code