Cleaned hammer class