Added indentation and other minor changes to basic settings