Removed batch and organized settings vars