Made some notes and cleaned some code