Cleaning the mess

I screwed the something while merging, but now its all ok.