took out some extra comments and cleared away testing stuff