bug fixed, format code
6 files changed