Cleanup and added more notes.