cleanup & annotations