[3 & 4] Clean it up

Quick Reply