Some formatting fixed; More to be tweaked