Replaced php array configuration with yaml and cleaned up code.