Fix style, remove debugging