Harmonized code layout
Typical late night spelling problem
Added onkick handler