Is there any room for improvement here?