Cleaned Up code

Cosmetic changes