Changed Pause/Resume to auto property, and some formatting