Make some order in the code.