Add comments, organize instance vars