Simplify initial code.