Minor lint removal and formatting