Put some cosmetics on the code