Changed missing iterators
Small code style changes
Removed now unused booleans