Code Clean-up

- fixed bugs with concatenation
- easier to read