The code is now clean.