Minor labeling and hardcoded-address removal