Change booleans to match style guide
fix comments