Doing the code better.