Shortened code a little more