code readabilty improvements