Slight cleanup, simpler