Small code cleanup
Version 1.3.12