- re-orging the code