[refactor] fixes and consolidations