MP1-4578 : Code formatting/beautification changes.
MP1-4578 : Rework Resume sequence and focus when finished. (Tourettes patch's)