Made a string a bit less magic
Ning + Refactoring