Fix all code. Much more small :)