improving the APEG syntax