Rewriting in more organized manner.