Lone pair scale refactoring, see #95