Some code cleaning. Want to save the progress.