gustafn
committed
on 12 Jun
improved clarity of the code and simplified structure