Cleaned up the spacing and indentation issues