Some cleanup and docs on helpers