code clean up #3 (set-up)