Task: Rorganized code