Added more comments removed some test code