Design & cleanup