cleanup & comments