fix
code simplification