cleaning the codez for #25