Spacing fix
Code re-use improvements
Parsing validation fixes