Simplifying code, removing unneeded lines.