Made some notes, did some cleanup