Naru - Seperated ClosingStrategy. General tidyup.