OCD: overly clean development
Added first vertical alignment checks