Cleaned up the library a bit