Minor updates to increase speed/style consistency