Code janitoring: indentation and al.