Fixed yard [ci skip]
Minor format fixes
Extract partial
Beautified format