STY: Clearer naming and code locations