More cleanup
library is functional