Fixed wrong Yard definitions
Improving Code metrics