trim whitespace to allow regression/unit tests to pass
remove commented code