Added definitions package.\nSmall code formatting changes throughout