style: improve naming and indentation