Some more polishing, primarily on shortened version