Remove commented lines and add docs