Fix indentation and other small fixes.