Fixed indentation, changed defaults