Got rid of some verbosity