added empty functions and corrected identifier regex