fixed style issues, debug output matches rust