-Clean Code and remoce some bugs