Great to see you can remove so much code here, this looks super clean.