Code cleanup and non-api-breaking refactoring