Made changes based on the comments by Sirupsen.