Integrate minor code cleanup