Small refactoring. Mainly renaming vars