Cleaned up lib.