refactor: better indentation, lines shorter than 80 characters