Made some changes according to feedback on Github.