fix indentation & blank lines, add more labels