Cleanup code
Update location plugin and add translations