Cleaning code for previous commit- Issue #142.