Cleaned up library