cleaned up and added settings to file