Removed isUnit.
Fixed case for multi-declaration in a for-loop.