Code cleaning and several changes.
Code cleaning and several changes.