Merge "code cleanup"