One bug fixed and some stuff cleaned