Removed unused
Changes to format
Tests added