More efficient and clean

- Marc Laventure