style: indentation and other minor style fixes