Refactoring, adding more defaults to modal class, adding bootstrap