Merge "Micro cleanup and refactoring"