refactor

cleanning code