Code cleanup round I