Commit with more improved code and less redudancy.