Cleaned Up Code

Cleaned Up Code