Shortened code a bit