refactor

cleaning the code