Small changes to style of code