made things a lot cleaner :)