Clean Up

Formatted and corrected code