Removed some test code
Refactored strings to be easily changed