Clean LINT warnings