Rewrite of main library for clarity