Cleaning Up Up spec