Revert back to more greedy constructor regex
Minor comment & code quality improvements
More comments