Reduced initialisation code


Signed-off-by: lg188 <lander.ghekiere@gmail.com>
Version 3

Fixed the duplication bug

Signed-off-by: lg188 <lander.ghekiere@gmail.com>