remove ; from end of the lines
use \ instead of + where possible
if .. else instead of unless .. else
small C improvements