8th commit: basic changes to style