fix indentation and other small issues