Removing dead code, adding inline docs