Cleaned up library

Cleaned up Library