last cleanup and refactor before a breaking release