XXX Cleans, fixes and gives shine 46172955

XXX Cleans, fixes and gives shine

XXX Cleans, fixes and gives shine

added: