Fixed: localization
Cleaned up code
Built