Added Comments, removed zombie code