Tidy/Add comments