Decent spec clean up