Fixed most lint warnings