(little) Code and xml cleanup