cleaning up library methods