refactor code and changed the code with SINET standards