Revert "Various clean-up suggestions"

This reverts commit 01ff4a00e283208d7c6ffdbe21b5aa9453812854.
Various clean-up suggestions