Some code style fixes and validating positive number regexp fix