* More fix, more cleaning