A lot of Code Quality fixes