starting code clean-up