Be less ad-hoc