Cleaned up call to strlen()