better keys and indentation behavior