source code cleanup

source code cleanup