Arranged the code.