(refactoring) Fix indentation
(warnings) Fix unsigned / signed comparison