Some formatting and small style changes