Indentation fixes + settings handling