* Externalized some strings, refactored a bit further