Shorter, cleaner code