Removed imports of old functions
Improved doc strings
Updated ignore