Some cleanup and notes