Refactor after a late night check-in. ;)