Introduction

minor refactoring