Some cleanup (#37)