Some minor cleaning up (#112).