Fixes #175
Code cleanup
Version 2.6.1