Cleaning
Cleaning
Refactoring quantization

See #48