Cleans up lint warnings