soruce code cleanup