Naru - Code tidyup.