Fixed and reorganized
Ruby fixed