Shortened a few more lines