Various review related changes and moved self.locale_build definition