Just some cleaning of code.
More cleaning