Expected it to be cleaner in general