Better size, removed unneeded code.