some minor code cleanup (#83)