cleanup & comments completed