Updated comments, removed test code