Revert "code cleaning/adjustments"

This reverts commit f50bed847ba6192290dcb7cce6c246ea0ba04fdb.