Simplify some code after some chance updates ;)