Several defaults defined + indentation revised