Formatting and added some goals