code clean up #4 (set-up)