Simplified the design
Simplified the overall structure