Cleaned up structure
Corrected versions