Well yes I messed up even between your post and your signature
Anyway my code was such a mess that "clean code" seemed right to me !