Fix indentation

Use 4 spaces per indentation level.
Cleanup and linting