cleaned and added cusomization attriubues