Cleaned Up

No major changes. Looks good!
Edited up through "I18N"