updated docblocks and indenting