Fixed Lint Issues