Some refactor here, some there