Add configuration class
Remove value check
Remove empty line
Use configuration class