minor renaming and removing unnecessary warning suppression again