STYLE: Using boolean and integer consistently