Fix #432 bug and indent fixes