Minor cleanup (#47)