Code clarity improvements