minor lib cleanup

Again with the standards