Mod-proof rubber trees, increase performance, clean code