Slight changes to style of assignment5