Refactor for a little code standard.