cleanups
shorter and makes more sense