Implemented some lint suggestions