cleanup ESL a little