(refactor) Lint told me to clean my shit up