Clean Up Code

Fixing errors