imrpoved formatting/commenting