Cleaned up config option