Merge "Some code cleanup"