made things a little cleaner in my skeleton code