Debugged leading whitespace issue.
Finished refactoring & cleanup of debugging code.