refactored design

Look up this word on Fala2Me