Implemented some Lint suggestions