Removed unneeded import
Parameter is optional
Added observable single
Cleanup