Redecorate the code