Code refinments.