Library updates
Code cleanup