Change the variable & other minor style.