Addressed comments by @lkursell and @ElDeveloper