Minor - pep8 and etc.
Fix - calling correct exception.
Added delete command with tests.