Changed some of the declarations of strings to more modern syntax

Consolidated lines, and also made code easier to read.