CHange assert to check for empty strings besides nil
One class per line
Removed unnecessary check