Source formatting/warnings clean up
Externalized some strings (more to go)