Code clarity improvements.