Shortened up a few lines