Some formatting fixed