More code clean-up and organization.