#time 15m #comment Slight cleanup.