Style improvement… work in progress commit