nit-picks fixed as requested by @scoder