ticket:1. Some cleanup to please Lint