Shortened if commands

round 2 in this file