Some code cosmetics, closes #30