Fixes Issue #27 and some refactoring on CSL