Cleaning Up Code

Cleaning Up Code