cleanup and add notes