Could’ve been a lot cleaner