Revert "Small modifications"

This reverts commit 8eac15c65f0e033638379947e44d690b05067031.
Revert "Revert "Small modifications""

This reverts commit 96ae12d142342a1dc467ffd70d08710a4b19eabe.