Refactor: Do not abbriviate variables