Cleanup

solved some warnings