style: clean up indentation and variable naming