Move whitespace significant parsing to Utils
Simplify code