Resolves multiple lint warnings

Signed-off-by: Aayush Gupta <theimpulson@e.email>