Add coverage
Simplify by removing "lstrip()" calls