Not using this here. See #3
Some minor code clean up. It's christmas so it's allowed right ;)