Minor updates to the general style