Cleaning up; components are less coupled now.