Revert "Minor changes"

This reverts commit 29f542651971382728a599f63e6d3bfbc88d5179.