Some formatting added