Code lint changes#2