Some clean up
switch to library