Fix comparison between signed and unsigned integer
Fix indentation