Updated with your suggestion and refactored that method a little bit. Thanks!