bit of tidy and elimination of warnings