whitespace and debugging cleanup