Simplifying the code by moving unneeded stuff away.