Code Cleanup lint warnings and more Pullrequest