Removed some verbosity and ambiguity