Updated design and cleanup