This was such a nice refactor, shorted to 4 lines of code!