Twelve days problem solved
Minor code cleanup