Saving a few bytes, minor clean-up

Just a few (10) bytes saved in the library and some minor clean-up (typo).