Fixed and cleaned up ELT2140