Cosmetics (removed commented out test code)