Added comments and modified regex