Cleaned config a bit