More localization and comments on code