formatting and bug fix