shorter/cleaner code