Refactor config a bit
Screenshot