cleaned up config a bit more