Second round of fixes

* Implemented suggestions