Organic matter models of oil shale revisited