IDEA-115305 (requirements to temp directory relaxed)
Cleanup (readability)