Minor changes,

Renamed handler, added comments.