cleaning up and organizing components