Add clicked view to RemoveListener.remove
Reformat and fix Javadoc