cleaned up components and views