cleaning some dirty code and file