Shortened a few more variable names...