Correct some problem of design and start to clean.