parser: removed duplication
style: not using pointer until I know why
some modifications, layout initial commit