1.2, code cleaning, fixed thread start