Removed return
Reorganized