Code cleanup 3