Some edits
Revert "Modified according to sensible comments"

This reverts commit 7967ae9af1d54ca3eefeca1e84bef69ee4ffa6bc.