Perso stops at exit, must test! + Code cleanup using ReSharper...