Some reformating;