Cleaning Up

Adding class Attributes