Updated code based on feedback from @mateusz
Merge pull request #1 from tractorcow/pulls/feedback

Updated code based on feedback from @mateusz