making this cleaner