Code cleanup

Add code cleanup