Code clean-up and organization.