Code Cleanup

Clearing more warnings / cleaning library.