Fixed all lint warnings