[UPDATE] Other code styling enhancement