bug fix
clean code