And refactoring and debug for #69