is this cleaner code?