code cleanup with lint check