Converted some private OnClickListener's variables into inline declarations
Removed superfluous instance variables
Scaffold for template editor