Cleanup
Removing hardcoded text
Merge pull request #3 from twg/features/misc

Cleanup