Updated plotting notebook to be cleaner, abstracted out plotting features