Remove unused macro undef
Use constant references
Add combine
Add unsharp mask