code cleanup
updated xcf files