Refactoring - Added comments
Added Chart Model Factory + Test