Making code more legible.

Prettified a lot of things. Also fixed string concatenation to a safer way (the correct way) of doing it.