Merge "Clean up commit to reduce duplicated code"