Remove redundance and cleaning some code