cleanup and small change of list spacing in #38 + shortened sample