Updated formatting - FINAL version