Cosmetic changes, small fixes in the code.