refactoring: fields and locals renaming to improve readability