updates design and cleanup