Functional improvements; Clear naming