Bug fixed and clean