Update
Better design

Also removed few bits here and there...