Constructor clean up (fix #109).