Fixed formatting issues
Fixed BC break