Code and comments cleanned