Wow that made things even more clean