Small changes, cleaning the code.