FEAT: some comments re-aligned, few extra spaces removed.