small syntax changes for clarity and better reading