Replacing empty strings with None in models

Closes #1