Cleaned up library and made the sample ready