Code review changes

* Fix styling issues
* Revert the changes to addProperty
* Perform operations sequentially instead of parallel