Cleaning code from warnings and comments