General editing and cutting
shortened things a bit, cleaned up some redundant points.