Uppercase method names
Cleanup
Return an error on an invalid item