Cleaning

Clean some little imperfections of the code.