Started code clean-up.