Code cleanup 2