Make some code cleanup