Applied some changes suggested by @fenek