Code clean up 1 !!