Cleanup - remove stripLeadingWhitespace()