Cleaning LINT warnings