Cleaned up ConfigFileReader a bit