Code clean up 2