Removed close class
Cleaner calling of the function, and with easy options