Share scheme
Code cleaning