Style fix and variable disambiguation