Code cleanup II