Refactoring + Convolution filter update