Cleaned up default locale code and added comments