Code cleanup
"More Cleanup"
lib