Rearranged .handle calls, edited comments
Renamed variables, generalized names displayed