Whitespace and removes unnecessary config vars