Some improvements can still be made.