Changed DP to SP
Fixed some lint errors