Fixed all lint issues