Initialisation added, cleaning up