Since the Handler interface was not being used and its implementation
not being subclassed anywhere, the first one was deleted and the latter
renamed, also added comments