Fixed lint errors identified by Eclipse