Remove string literal
Reduce nesting of statements