Clean Up

Cleaned up and formatted code