Revert "minor changes"

This reverts commit 209fe6ae46f47aeeda647657c637b5cd45f8a211.
Revert "Revert "minor changes""

This reverts commit 98c434b6e6d7d8efd8960e89a30138a04bb897c6.
cleaning my mess ups
final