Cleaned up config a little