Fixed some minor issues, Updated Formatting