Code cleanup 2013 - 06 - 4