changed comments, removed test code