Simplefied some things