Refactored the code enough that it's not violating the 80 character limit anymore.