Code lint changes