Cleeaned up formatting